Patch from Matthias Clasen to fix some typos (#77246)

Thu May 16 15:17:30 2002  Owen Taylor  <otaylor@redhat.com>

        * pixops/pixops.c: Patch from Matthias Clasen to fix some typos
        (#77246)

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 8d4ff6be0fc9bc002fa3be3f253ffc0a595b45fd..dd0855847e68d73807e6abb6eb40b88c32a3ce6b 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 16 15:17:30 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * pixops/pixops.c: Patch from Matthias Clasen to fix some typos 
+       (#77246)
+
 Thu May 16 15:02:46 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk-pixdata.c (gdk_pixdata_to_csource): Fix 64-bit warning.

diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c
index 593895edd31bd59cf074a84b43cfaf4bf446681a..57c48d390644bae6469ad17613d5533d1a3f71cd 100644 (file)
--- a/gdk-pixbuf/pixops/pixops.c
+++ b/gdk-pixbuf/pixops/pixops.c
@@ -493,13 +493,13 @@ composite_line_22_4a4 (int *weights, int n_x, int n_y,
       b += ta * q0[6];
       a += ta;
 
-      ta = w3 * q0[3];
-      r += ta * q0[0];
-      g += ta * q0[1];
-      b += ta * q0[2];
+      ta = w3 * q1[3];
+      r += ta * q1[0];
+      g += ta * q1[1];
+      b += ta * q1[2];
       a += ta;
 
-      ta += w4 * q1[7];
+      ta = w4 * q1[7];
       r += ta * q1[4];
       g += ta * q1[5];
       b += ta * q1[6];
@@ -881,16 +881,15 @@ scale_line_22_33 (int *weights, int n_x, int n_y,
       g += w3 * q1[1];
       b += w3 * q1[2];
 
-      r += w4 * q1[4];
-      g += w4 * q1[5];
-      b += w4 * q1[6];
+      r += w4 * q1[3];
+      g += w4 * q1[4];
+      b += w4 * q1[5];
 
       dest[0] = (r + 0x8000) >> 16;
       dest[1] = (g + 0x8000) >> 16;
       dest[2] = (b + 0x8000) >> 16;
       
       dest += 3;
-      
       x += x_step;
     }